Better merge overlap detection. #178