setting up for merge conflict testing