more updates for trail merge