please watch your merge (before committing), this is fixed in a commit later