master new file added
conflict content
auto merging of index file
branchone copy