Merge pull request #91 from aalness/master

Log conflicts on connect block
Fix reorg handling