Fix after conflict resolution