resolve and merge vertres changes