Fixed Git's shitty-ass backwards merging.