added a model
merge fix