README updated following initial merge conflict resolution