merged a conflict