Amended README again and again
Conflict resolution