fixed merger + putting of empty buffers
checkpoint commit: code clean up