Search for three greater than signs or three less than signs in a code base to make sure that you've found all of the spots that need to be cleaned up on the other side of a merge.

I think you can see what that would find.