Similarly this file is in an old revision. Perhaps something gets lost during merge. Could you try to rebase to see whether it helps?