add REAME
resolve merge conflict