Fixed the merge problems