persisting form data between modals
fixing merge conflicts