create conflict: part 1
create conflict: branch master