I noticed it was still marked as conflict

It didn't fix anything when I removed these tags, One thing I did
notice is you are letting sass render your CSS while I love sass and it
is a strong helper with CSS in this instance I think it globally
overwrites too much when we are taking a "quick fix" approach to this
for proof of concept