Finish merge (again)