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