deletes

delete conflicted files and update README with comments.