I have no idea why this is marked as conflicting. git doesn't think there are conflicts (github should really try using git, it's a great DVCS). I'll "resolve" manually if reviewer wants, although if less ridiculous solution is known, please advise.