Fixed shitty merge