Remove merge conflict left-over.