Fixed merge conflicts
Fix new segfault; bad Pops added
fixed merge