Update Readme (2.1.1)
Resolve conflicts