merge to fix untracked files