Fixes faulty conflict resolution