clean up code blocks
merging-stuff section