block_number setting
more visual info
drawing of merged files
changed visual print
Merge remote-tracking branch 'refs/remotes/upstream/master'