Hello in readme.md
Resolve conflicts