handle saving conflicts more gracefully. fixes #39