fixConflict