Adding a change to create conflict