conflict a.file
solve conflict