Removes merge conflict missed in previous commit