resolved conflict before merge