Merges in unstashed changes
Fixes erasing segfault