reduce diff to trunk