dev commit
merge with no-ff
git config --global color.ui true
change next.html