Changes done to create a conflict