local commit from partial pull conflict
Comitting merge conflicts
Editing merge conflict with swap file
Setup all models, extra page controller and hooked up my structure for db entry for pages