Remove merge conflict that snuck in.