Fixed shitty merge (bad git)