Fix to resolve merge conflict
Fixed merge conflict pt 2