segfault errors after merge. It appears we broke the program.