rm next.html
add next.html
dev commit
feature commit
master commit
conflict commit