Merging untracked changes found at dreamhost