updates README
fixes merge conflict