fixed conflict and flipped numbers