Conflicts: gtsam/base/SymmetricBlockMatrix.cpp gtsam/linear/JacobianFactor-inl.h gtsam_unstable/geometry/tests/testTriangulation.cpp