screwed up merge