Merge Mike's tree