Fixed the strangest merge error on this side of Hoth