adding change that will bring conflict 1