added merge action