initial work for issue 399: add --force flag

See #399.
Also, don't remove @mr-c entry.