reduce differences to trunk