Updates to fire merge scripts