Fixed the merge conflicts