Merge branches 'master' and 'master.0.0.1'
vim conf add
Merge branches 'master' and 'master.0.0.1' into master.0.0.1