I am pretty sure that concurrent changes that occur on the same line always trigger a conflict where as it's less often the case for stuff on separate lines.