tracked files conflicting