refactor/comment, change normal to ongoing
conflict resolved