Colombia, Venezuela resolve row