Create conflict on master