Got rid of a merge conflict artifact!