FIXED the merge catastrophe