bug fix?
cleanup model for merge
cleanup directory
switch master to operand with of op1_25 op2_25