Mistake during merge with master