Fixed in-place merging so that updates work
Merge https://github.com/sachinravi14/COS-598C-Project