models unmodified, views included try/except block in create user view to handle creation errors
merge conflict resolution