README.md modified
somefix and add log
resolve conflicts