Fixed the merge