I think you resolve conflicts with wrong side.