Fix Merge

It makes also the handling of "No stops at this location" better.