fixing git issues with untracked files