Fixed merging weirdness

Stupid Github client :P