Move merge above to not overrite explicitly set variables