Fixed the merge problem