Albany: resolving merge connflict in PHAL_GatherSolution_Def.hpp PHAL_ScatterResidual_Def.hpp