fixed merge conflicts

.gitignore

.../objs/LabelTranslationManager/LabelTranslationManager.cpp

...bjs/LabelTranslationManager/LabelTranslationManager.truth

isis/src/base/objs/LabelTranslationManager/unitTest.cpp

isis/src/base/objs/ProcessExportPds4/Makefile

isis/src/base/objs/PushFrameCameraCcdLayout/Makefile

isis/src/base/objs/SpicePosition/SpicePosition.cpp

isis/src/control/apps/jigsaw/tsts/errors/Makefile

isis/src/hayabusa2/apps/hyb2onc2isis/Makefile

isis/src/juno/apps/junocam2isis/Makefile

isis/src/qisis/objs/Directory/RemoveImagesWorkOrder.cpp

isis/src/qisis/objs/WindowTool/WindowTool.cpp

isis/src/tgo/apps/tgocassisrdrgen/Makefile