make sure I created the conflict on master branch