after solving conflicts