fixed issue with devise
unworking merge issues
fixed issue in devise.rb
removed salt issue
fixed merge issues