Fixed bug when the merge_id doesn't exist, and changed desired behavior of post-merge