add --force-confold
Merge pull request #233 from seanchannel/develop

add --force-confold