Schema updated as well as code base!
Git ignore updated
Conflict resolved