Made the requested changes!

[yashmathne]

Description

Solved the conflicts, made the Elf-Hat little wider and ran SVGO on the svg files.

I made multiple new items on the previous PR.
PR for reference - #3825

Checklist

• Read and conforms to the contributor guidelines
• Read and conforms to the style guidelines
• Linter status: 100% pass
• Added relevant tests
• Tests pass and code coverage has not decreased
• Changes don't break existing behavior
• Commit message follows commit guidelines
• Code documentation
• Completed: Code review by core team and any requested changes

Affected core subsystem(s)

Refers/Fixes

Testing and Sign-off

Contributor

• Read and followed the Contributor Guidelines
• Tested all changes locally
• Verified existing functionality
• Ran make test and everything passed!

Reviewer

• Affirm contributor guidelines have been followed and requested changes made
• CI tests and linting pass
• No conflicts (migrations, files, etc)
• Regression tested against staging or local deployment

Funder

• Validated requested changes were made to specification
• Bounty payout released to the contributor

[thelostone-mc]

@yash412 conflicts still persist :P

[codecov]

Codecov Report

Merging #3827 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #3827   +/-   ##
=======================================
  Coverage   29.56%   29.56%           
=======================================
  Files         201      201           
  Lines       15519    15519           
  Branches     2036     2036           
=======================================
  Hits         4588     4588           
  Misses      10776    10776           
  Partials      155      155

Impacted Files	Coverage Δ
app/avatar/utils.py	14.8% <ø> (ø)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ae0602e...8987d89. Read the comment docs.

[codecov]

Codecov Report

Merging #3827 into master will increase coverage by 12.64%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           master    #3827       +/-   ##
===========================================
+ Coverage   16.91%   29.56%   +12.64%     
===========================================
  Files         191      201       +10     
  Lines       15510    15519        +9     
  Branches     2044     2036        -8     
===========================================
+ Hits         2624     4588     +1964     
+ Misses      12877    10776     -2101     
- Partials        9      155      +146

Impacted Files	Coverage Δ
app/avatar/utils.py	14.8% <ø> (ø)	⬆️
app/avatar/admin.py	71.79% <0%> (-5.35%)	⬇️
app/grants/admin.py	40.54% <0%> (-1.44%)	⬇️
app/app/settings.py	77.22% <0%> (-1.22%)	⬇️
app/dashboard/admin.py	69.72% <0%> (-1.08%)	⬇️
app/grants/models.py	49.01% <0%> (-0.61%)	⬇️
...itcoinbot/management/commands/get_notifications.py	0% <0%> (ø)	⬆️
app/retail/templatetags/is_in_list.py	100% <0%> (ø)
app/kudos/templatetags/kudos_extras.py	70% <0%> (ø)
... and 80 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e1ef5c5...89cb0e6. Read the comment docs.

[yashmathne]

Can you review them again @thelostone-mc!
Thanks a ton.

[yashmathne]

These are the names of the newer assets, yet it is appearing as a conflict. Can you suggest what needs to be done? @thelostone-mc

[thelostone-mc]

Took care of it ^_^

[yashmathne]

@thelostone-mc just out of curiosity, what was the issue?

[thelostone-mc]

@yash412 I just pulled it in and resolved the conflicts.
I'm guessing someone else had touched that line and thus entered the conflicts

[gitcoinbot]

⚡️ A tip worth 1.05000 ETH (144.08 USD @ $137.22/ETH) has been granted to @yash412 for this issue from @owocki. ⚡️

Nice work @yash412! Your tip has automatically been deposited in the ETH address we have on file.

• $57898.30 in Funded OSS Work Available at: https://gitcoin.co/explorer
• Incentivize contributions to your repo: Send a Tip or Fund a PR
• No Email? Get help on the Gitcoin Slack