Trying to fix a merge conflict