# Conflicts: # src/components/structures/UserSettings.js # src/i18n/strings/en_EN.json First time using JetBrains Merge Tool, MAY HAVE GONE HORRIBLY WRONG Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>