Fix the merge conflicts