fix override when the original and the override have overlapping substrings

fix override when the original and the override have overlapping substrings #559