Removing blocks now removes the falling block highlighting when	applicable
Fixed merging issues..