lib cnflicts change