I solved the merge problem