#@ opts.strategy=union
#@ expect.clean=true
#@ expect.conflict_count=0
this file is changed in master and branch
this file is changed in branch and master
