Locally untracked conflict files