Fix screwed up merge