Fixing conflicts

CMakeLists.txt

projectid.sh

src/BoundaryConditions/MethodOfImages.hpp

src/BoundaryConditions/SurfaceNormal.hpp

...tions/tests/libForTesting/HelpFunctionsForTestingNBCs.hpp

...yConditions/tests/method_of_images_cylinder_unit_test.cpp

src/BoundaryConditions/tests/method_of_images_unit_test.cpp

src/CMakeLists.txt

src/DCPSE/DCPSE_op/DCPSE_Solver.hpp

src/DCPSE/DCPSE_op/DCPSE_op.hpp

src/DCPSE/DCPSE_op/EqnsStruct.hpp

src/DCPSE/DCPSE_op/tests/DCPSE_op_Solver_test.cpp

src/DCPSE/DCPSE_op/tests/DCPSE_op_subset_test.cpp

src/DCPSE/DCPSE_op/tests/DCPSE_op_test3d.cpp

src/DCPSE/DCPSE_op/tests/DCPSE_op_test_base_tests.cpp

src/DCPSE/DCPSE_op/tests/DCPSE_op_test_temporal.cpp

src/DCPSE/Dcpse.hpp

src/DCPSE/DcpseDiagonalScalingMatrix.hpp

src/DCPSE/DcpseRhs.hpp

src/DCPSE/Monomial.hpp