I merged a thing

I hope it works