Fixed some formatting issues in the merge conflict