merge branch to trunk