Merge @sheats in