# Conflicts:
#	src/main/java/com/jagrosh/vortex/automod/AutoMod.java
#	src/main/java/com/jagrosh/vortex/automod/InviteResolver.java
#	src/main/java/com/jagrosh/vortex/commands/automod/AntiduplicateCmd.java
#	src/main/java/com/jagrosh/vortex/commands/automod/BlacklistCmd.java
#	src/main/java/com/jagrosh/vortex/commands/moderation/BanCmd.java
#	src/main/java/com/jagrosh/vortex/commands/settings/SettingsCmd.java
#	src/main/java/com/jagrosh/vortex/commands/tools/AuditCmd.java
#	src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java
#	src/main/java/com/jagrosh/vortex/database/managers/IgnoreManager.java

basic changes (find/replace stuff)
still lots of errors