merged untracked files