Fixed my merge conflict