fix remains of conflict