added merge steps