merge conflict, not resolved