ran devise install
devise working but links are not
fixing merging conflicts