users model added
conflict resolved