- prefer master branch's copy of files when merging