Fixed bug with deleting cells
Fixed merge conflict