Clean up merge failure

svn path=/branches/release/libs/algorithm/; revision=83170
more merge failures

svn path=/branches/release/libs/algorithm/; revision=83171