Merging untracked files