adding untracked files
merging files