Solved merging problem between two vertions