mistake after merge