add comments in dev branch
conflict resolve