Fix my shitty merge