solve conflict
remove README