fix mondrian 3 support
fix merge