user login working using devise
fixing merge conflict