Fix conflict resolution