commit trunk merges on branch