merging in everythang