try to fix screwed up merge