Fix shitty merge