Still trying to resolve the Great Merge Fuckup of 2014