commit to introduce conflict