remove conflicting untracked that break pulls