Git kinda sucks sometimes

Stupid merges.