add readme
resolve conflic