edit read me
solve conflict