chages in model and post cntlr and routes
conflicts resolved