fixed model
fixing merge conflict