track diffconflicts file