Tried to merge the clusterfuck

Godammit, this is what I get for using the GitHub app instead of the command line.