random change after merge