ehh, merge it