added merge-info to sub folder my merging with sub folder from trunk