Small change
Fixed a merge conflict