Fix conflict resolution optimization