fix shitty merge