Update README

Just for testing conflict =)
Resolved Readme conflict

Just a test