structure of files
resolved conflicts