bugfix-while-merge