Create README.md.
Resolve conflicts