Solving conflicts through merge