More screwed up merge...