Resolved README merge conflict
