solver model complete
merged
merged