User model done
Conflicts resolved