improve fileconflicts code