fixed the fix
Merge remote-tracking branch 'origin/master'
removed unused PluggableDiffMergeMorph