merged Trunk