Sync / Bug-fix:

 - Added check for edge-edge conflicts