merging trunk