read me file added some text
resolve conflict