segfaulting with added free blocks
fixed segfault
conflicts