Dammit that was one fubar merge