working together after class, merge first