merge conflict resolved with README