model added
conflict resolved