Fix more merge artifacts

- Next time warn me, before you change absolutely every line in every
single file! XD