added merge-info by merging with trunk