back to conflict merge