would like help merging have conflicts and would like some help
was able to merge in git with no issues but when i tried to pull main it created conflicts
REQUIRED Check all that apply:
[ x] Rubber Ducking
[ x] Direction/Guidance
[ ] Check In (Pep talk, vent session, etc.)
Code Snippet
Auto-merging src/components/records/RecordForm.js
CONFLICT (content): Merge conflict in src/components/records/RecordForm.js
Automatic merge failed; fix conflicts and then commit the result.
Name:Thomas
Breakout Room:Thomas
REQUIRED Question or issue:
REQUIRED Check all that apply:
Code Snippet