merge finished