merging in untracked changes