FIXED: various problems with the merge, including a memory crash