BFGS done
fix conflicts