add new model
resolve merge conflict
added model complete