Fixed a merge conflict that affected the code