I think I merged stuff correctly.