forgot some merge stuff