gray code merge
graycode conflict resolved