most of controllers added
conflict for devise resolved