Someone merged without solving conflict