Colombia and Venezuela settle their past quarrel