change digit
solve conflict