README: resolve merge conflict