newfile edited by master need to merge
newfile edited by master need to merge
newfile edited by master need to merge
newfile for branch
delete newfile.orign for branch
change in newfile  for branch