Create a conflict in master.