files on computer of company
solve the conflict