start new version
add error message on master branch
edit conflict.