fixed a merge error; incremented number