clean up

Author: jmilljr24

Gemfile

@@ -46,6 +46,8 @@ gem "country_select"
 gem "turbo-rails", "~> 2.0"
 gem "stimulus-rails", "~> 1.3"
 
+gem "active_storage_validations", "~> 3.0"
+
 group :development, :test do
   gem "better_errors"
   gem "brakeman", require: false

app/views/users/_form.html.erb

@@ -1,6 +1,5 @@
-<<<<<<< HEAD
 <%= simple_form_for @user, html: { multipart: true, class: "space-y-8" } do |f| %>
-  <%= render 'shared/errors', resource: @user if @user.errors.any? %>
+  <%= render 'shared/errors', resource: user if user.errors.any? %>
 
   <!-- Basic Info + Avatar -->
   <!-- Container -->