Understanding the models
Solved the merge conflict