devise routes still not working
conflict fixed
devise views removed again