Patch Set 1: I would prefer that you didn't submit this; IP review completed

(3 inline comments)

I was near to give up reviewing this. I spent more than one hour looking at this before I got the point. 

You did a few refactorings (extracting blocks into own methods) and moving code around alltogether which made it
hard for me to find out where you really changed stuff semantically. If we are touching these core parts like merge algorithm I suggest that we really split pure refactorings/cleanup into an own proposal and do the real fixes in a seperate one. I bet that this is much faster to review although we have one proposal more.