How do I solve this merge conflict?
Without changing master
Mainly gaming/nerd instance for people who value free speech. Everyone is welcome.
