Updated for shared BLAS R install
Fix merge conflict.