a commit for resolving conflicts

don't know what's wrong with readme.txt and test.txt.