mistake during merge