fixMaxConflict done