fixed a bug with block statements
merging