prepare master for merge conflict example