Updating database objects with a form
Fix merge conflict