first file for gs-25
solve conflict