models and admin site OK
solved merge conflict