conflict workflow on save model revision

fixes #563