user model added
conflicts are fixed