some last bit of merge stuff i swear