make a conflict in master