merge problem resolve