Track the files conflict history