Handle merge conflict for 'No stops at this location'

Sorry, this was caused by me for merging PRs in a poor order.