There will be conflicts block merging when push -f used

[mytharcher]

May need do one more git reset --hard HEAD to ensure the branch is up-to-dated.