set up for next merge conflict test