clean up merge conflict foo.