resolve conflicts

app/controllers/admin_controller.rb

@@ -52,8 +52,7 @@ def reset_user_password
         # send key to user email
         PasswordResetMailer.reset_notify(user, key).deliver_now unless user.nil? # respond the same to both successes and failures; security
       end
-
-      flash[:notice] = "#{user.name} should receive an email with instructions on how to reset their password. If they do not, please double check that they are using the email they registered with."
+      flash[:notice] = "#{user.name} should receive an email with instructions on how to reset their password. If they do not, please double check that they are using the email they registered with." 
       redirect_to URI.parse("/profile/" + user.name).path
     end
   end

app/controllers/relationships_controller.rb

@@ -10,7 +10,7 @@ def create
   def destroy
     user = Relationship.find(params[:id]).followed
     current_user.unfollow(user)
-    redirect_to "/profile/#{user.username}"
+    redirect_to URI.parse("/profile/#{user.username}").path
   end
 
   private