diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 64328ec..025ba92 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD:src/main/resources/config.yml
 #===============================================================
 #                     VentureChat Config                       =
 #                      Author: Aust1n46                        =                  
@@ -421,429 +420,4 @@ channels:
     alias: l
     permissions: None
     speak_permissions: None
-=======
-#===============================================================
-#                     VentureChat Config                       =
-#                      Author: Aust1n46                        =                  
-#===============================================================
-
-# - regex1,regex2
-# Simple regex tips: Use \b to "cut" a section of the word or phrase.  Example: \bass,donuts
-# Example filtered sentence: You are an ass.  Will become: You are an donuts.  
-# Example filtered sentence: You caught a bass.  Will stay: You caught a bass.  
-# Example filtered sentence: You are an asshole.  Will become: You are an donutshole.
-# Default filters by Jabelpeeps
-filters:
-- (\b.?anus),donuts
-- (\ba+r*(se+|ss+(?!(ass|um|oc|ign|ist)).*?|s*e*h+[o0]*[l1]+e*[sz]*)\b),donuts
-- (b[i1]a?tch(es)?),puppy
-- Carpet Muncher,cookie monster
-- (\bc((?!ook\b)[o0]+c*|aw)k\W?(sucker|s*|he[ea]*d)\b),rooster
-- (\b[ck]r+a+p+(er|s|z)?\b),poopoo
-- (\bcu+m+\b),go
-- (\b.?[ck](u*n+|[l1]+[i1]+)t+[sz]*\b),peach
-- (\b.?d[1i](c?k(head)?|[l1]+d[o0])e?[sz]?\b),rooster
-- f u c k( e r)?,nono
-- (\b.?fai*g+[oei1]*t*[sz]*\b),cigar
-- Fudge Packer,fine person
-- (\b(m[uo]+th[ae]r?)?(f|ph)uc*k*(e[rn]|ah*|ing?|)[sz]?\b),oh dear
-- (\b(j(ac|er|ur)k\W?(of+))|(ji[sz]+i*m*)\b),bake brownies
-- (\b(ma+s+te?rbai?te?[rs]?|wank(er)?[sz]?)\b),bake brownies
-- orafi(s|ce),rooster
-- (\bp+[e3]+[ai]*n+[i1!ua]+s+),rooster
-- (\bp[i1]s+(?!(ton))(flap|face|drop)?),peepee
-- (\b.?sh[i1!y]t+(er?|y|head)?[sz]*),poopoo
-- (\bva[1i]?[gj]+[i1]+na+\b),peach
-- vu[1l]+va,peach
-- planet.?minecraft,another dimension
-- pmc,another dimension
-- ((\d+\.){3}\d+),another dimension
-
-# command without the /
-blockablecommands:
-- vote
-- me
-
-# blacklisted nicknames 
-nicknames:
-- Notch
-
-nickname-in-tablist: true
-
-# {player} : player sending command
-# {command} : command typed
-commandspy:
-  format: '&6{player}: {command}'
-  worldeditcommands: true
-  
-antispam:
-  enabled: true
-  
-  # Number of messages to be spam
-  spamnumber: 5
-  
-  # Amount of time in seconds for it to be spam
-  spamtime: 10
-  
-  # Amount of time for the mute to last
-  # Acceptable units are: d,h,m,s
-  # Units can be combined, for example: 1d8h30m15s
-  # Use 0 for untimed mute
-  mutetime: 10m
- 
-# Logging chat and commands to a mysql database 
-mysql:
-  enabled: false
-  user: User
-  port: 3306
-  password: Password
-  host: localhost
-  database: Database
-
-# Loglevel feature is still in the works for adding of debug messages
-# Valid loglevels:
-# Info: Regular logging
-# Debug: Show extra messages and caught errors for debugging
-# Severe: Only show severe messages
-loglevel: info
-
-# saveinterval is in minutes
-saveinterval: 30
-
-# If you're running a "cracked" server, player data might not be stored properly, and thus, you are on your own.
-# If you run your server in offline mode, you might have to reset your player data when switching to online mode!
-# If you see this warning by accident and you are using BungeeCord, make sure you have properly setup IP Forwarding.
-# https://www.spigotmc.org/wiki/bungeecord-ip-forwarding/
-# No player data will be saved in offline mode unless you set this acknowledgement to 'true'
-offline_server_acknowledgement: false
-
-# The time in seconds between each check to remove timed mutes
-unmuteinterval: 60
-
-# Enables or disabled BungeeCord messaging
-bungeecordmessaging: false
-
-# Sound for message notification
-# Enter 'None' to disable the sound
-message_sound: ENTITY_PLAYER_LEVELUP
-
-# This will allow vanished players to be exempt from being sent private messages, and will act as if they aren't online
-vanishsupport: true
-
-# Use PlaceholderAPI placeholders
-# Start the placeholder with 'sender_' for the sending players placeholder
-# Start the placeholder with 'receiver_' for the receiving players placeholder
-# The defaults shown below provide an example of each
-tellformatto: '&7You message {receiver_vault_prefix}{receiver_player_displayname}&7:'
-tellformatfrom: '{sender_vault_prefix}{sender_player_displayname} &7messages you:'
-tellformatspy: '{sender_player_name} messages {receiver_player_name}:&7'
-replyformatto: '&7You reply to {receiver_vault_prefix}{receiver_player_displayname}&7:'
-replyformatfrom: '{sender_vault_prefix}{sender_player_displayname} &7replies to you:'
-replyformatspy: '{sender_player_name} replies to {receiver_player_name}:&7'
-
-# {host} : party hosts name
-# {player} : player name
-# use Default for the basic formatting
-partyformat: Default
-
-formatcleaner: true
-
-# If true, /ignore will block chat from the ignored player as well as PM's
-ignorechat: false
-
-# The message shown to players alerting them no one is in the channel to hear them
-emptychannelalert: "&6No one is listening to you."
-
-messageremoverpermissions: '&cYou need additional permissions to view this message!'
-messageremovertext: '&c&o<message removed>'
-
-# The name of the group is the permissions node for the format
-# Example: venturechat.json.Owner is the node for the group Owner
-# A lower priority overrides a higher priority if a player has more than 1 group
-# Possible options for click_name and click_prefix are suggest_command, run_command, and open_url
-jsonformatting:
-  Default: # This default format is required!  Do not delete or rename it!
-    priority: 2147483647 # Integer.MAX_VALUE
-    hover_name:
-    - '&6I have no rank!'
-    click_name: 'suggest_command'
-    click_name_text: '/msg {player_name}'
-    hover_prefix:
-    - '&dI am default!'
-    click_prefix: 'run_command'
-    click_prefix_text: '/help'
-    hover_suffix:
-    - '&dI am default suffix!'
-    click_suffix: 'suggest_command'
-    click_suffix_text: '/msg {player_name}'
-  Owner:
-    priority: 1 # Lowest Priority
-    hover_name:
-    - '&cOwner of the server!'
-    - '&bMessage me for help!'
-    click_name: 'suggest_command'
-    click_name_text: '/msg {player_name}'
-    hover_prefix:
-    - '&dServer Owner'
-    click_prefix: 'run_command'
-    click_prefix_text: '/help'
-    hover_suffix:
-    - '&dI am Owner suffix!'
-    click_suffix: 'suggest_command'
-    click_suffix_text: '/msg {player_name}'
-    
-# The icon is the block shown in the GUI
-# The text is the display name of the block icon
-# Include a slash (/) before the command   
-# Permissions are the name of the button and automatically include "venturechat." 
-# Example: mute equals venturechat.mute
-venturegui:
-  mute:
-    icon: 'REDSTONE_BLOCK'
-    durability: 0
-    text: '&cMute {player_name} &410m'
-    permission: 'mute'
-    command: '/mute {channel} {player_name} 10m'
-    slot: 1
-  unmute:
-    icon: 'DIAMOND_BLOCK'
-    durability: 0
-    text: '&bUnmute {player_name}'
-    permission: 'mute'
-    command: '/unmute {channel} {player_name} '
-    slot: 2
-  removemessage:
-    icon: 'DIAMOND_AXE'
-    durability: 0
-    text: '&cRemove Message'
-    permission: 'removemessage'
-    command: '/removemessage {hash} {channel}'
-    slot: 7
-
-guiicon: '&c [✓]'
-guitext: '&cOpen Moderation GUI'
-guirows: 1
-
-# All clickable URL's will be underlined if set to true
-underlineurls: true
-
-# broadcast information
-broadcast:
-  color: red
-  permissions: venturechat.adminchannel
-  displaytag: '[Broadcast]'
-  
-# Use $ to include arguments into the message  
-# Valid component types are:
-# Command: Sends a message or command in chat
-# Message: Sends a message to the player
-# Broadcast: Sends a broadcast to all players on the server
-# Permissions automatically include "venturechat." 
-# Example: permissions: alert equals venturechat.alert
-# Use None for no permissions
-# The number of arguments is the minimum number of required arguments, use 0 for no required arguments
-alias:  
-  vote:
-    arguments: 0
-    permissions: None
-    components:
-    - 'Message: &6Vote here: www.votelinkhere.com'
-  bane:
-    arguments: 2
-    permissions: bane
-    components:
-    - 'Command: /ban $ appeal at www.site.com'
-    - 'Command: /st banned $'
-  alert:
-    arguments: 1
-    permissions: alert
-    components:
-    - 'Broadcast: &c<Alert> $'
-  donate:
-    arguments: 0
-    permissions: None
-    components:
-    - 'Message: &bDonate here: www.mywebsite.com'
-  website:
-    arguments: 0
-    permissions: None
-    components:
-    - 'Message: &aThis is our website: www.site.net'
-  
-# Enables the creation of special Towny channels: Town and Nation
-# To create these channels, simply name two channels below "Town" and "Nation"
-# Bungeecord must be set to false for these channels! 
-enable_towny_channel: false
-
-# Enables the creation of a special faction only channel using the Factions plugin
-# To create this channel, simply name a channel below "Faction"
-# Bungeecord must be set to false for this channel!
-# WARNING: May not work for all versions of Factions!
-enable_factions_channel: false
-
-# color = [channel] color
-# chatcolor = text color
-# cooldown is in seconds
-# bungeecord overrides distance
-# channel permissions are configurable
-# channels can be changed, and new channels can be created
-# Permissions automatically include "venturechat." 
-# Example: permissions: staff equals venturechat.staff
-# Use None for no permissions
-
-# Use PlaceholderAPI placeholders are required!!!
-# Use PlaceholderAPI placeholders are required!!!
-# Use PlaceholderAPI placeholders are required!!!
-# /papi ecloud download [plugin]
-# /papi reload
-# Use '' or "" around format, example: '[&2global&f] {vault_prefix} {player_displayname}&2:'
-# You must have prefixes and suffixes set in a Vault compatible permissions plugin to avoid errors
-# Use "" as the prefix or suffix to have none
-
-# Set chatcolor to 'None' to have a group based chat color! Don't forget to put a suffix or other placeholder at the end of the format!
-
-# Important!!!
-# Important!!!
-# If you delete a channel, restart the server! Do not use /chatreload!!!
-channels:
-  GroupChatColorExample:
-    color: '#706C1E'
-    chatcolor: 'None'
-    mutable: true
-    filter: true
-    autojoin: true
-    default: false
-    distance: 0
-    cooldown: 0
-    bungeecord: false
-    alias: ge
-    permissions: None
-    speak_permissions: None
-    format: '&f[#706C1EGroupColorChat&f] {vault_prefix} {player_displayname}#706C1E:{vault_suffix}'
-  HexExample:
-    color: '#ff0000'
-    chatcolor: '#ff0000'
-    mutable: true
-    filter: true
-    autojoin: true
-    default: false
-    distance: 0
-    cooldown: 0
-    bungeecord: false
-    alias: he
-    permissions: None
-    speak_permissions: None
-    format: '&f[#ff0000Hex&f] {vault_prefix} {player_displayname}#ff0000:'
-  BungeeExample:
-    color: gold
-    chatcolor: gold
-    mutable: true
-    filter: true
-    autojoin: true
-    default: false
-    distance: 0
-    cooldown: 3
-    bungeecord: true
-    alias: be
-    permissions: None
-    speak_permissions: None
-    format: '&f[&6Network&f] {vault_prefix} {player_displayname}&6:'
-  AnnouncementExample:
-    color: red
-    chatcolor: red
-    mutable: false
-    filter: false
-    autojoin: true
-    default: false
-    distance: 0
-    cooldown: 0
-    bungeecord: true
-    alias: announce
-    permissions: None
-    speak_permissions: announcement
-    format: '&f[&aServer Announcement&f] {vault_prefix} {player_displayname}&c:'
-  Global:
-    color: dark_green
-    chatcolor: dark_green
-    mutable: true
-    filter: true
-    autojoin: true
-    default: true
-    distance: 0
-    cooldown: 0
-    bungeecord: false
-    alias: g
-    permissions: None
-    speak_permissions: None
-    format: '&f[&2Global&f] {vault_prefix} {player_displayname}&2:'
-  Staff:
-    color: green
-    chatcolor: green
-    mutable: false
-    filter: false
-    autojoin: true
-    default: false
-    distance: 0
-    cooldown: 0
-    bungeecord: false
-    alias: st
-    permissions: staffchannel
-    speak_permissions: None
-    format: '&f[&aStaff&f] {vault_prefix} {player_displayname}&a:'
-  Donator:
-    color: light_purple
-    chatcolor: light_purple
-    mutable: true
-    filter: true
-    autojoin: true
-    default: false
-    distance: 0
-    cooldown: 0
-    bungeecord: false
-    alias: d
-    permissions: donatorchannel
-    speak_permissions: None
-    format: '&f[&dDonator&f] {vault_prefix} {player_displayname}&d:'
-  Help:
-    color: aqua
-    chatcolor: aqua
-    mutable: true
-    filter: true
-    autojoin: true
-    default: false
-    distance: 0
-    cooldown: 0
-    bungeecord: false
-    alias: h
-    permissions: None
-    speak_permissions: None
-    format: '&f[&bHelp&f] {vault_prefix} {player_displayname}&b:'
-  Trade:
-    color: dark_aqua
-    chatcolor: dark_aqua
-    mutable: true
-    filter: true
-    autojoin: true
-    default: false
-    distance: 0
-    cooldown: 0
-    bungeecord: false
-    alias: t
-    permissions: None
-    speak_permissions: None
-    format: '&f[&3Trade&f] {vault_prefix} {player_displayname}&3:'
-  Local:
-    color: yellow
-    chatcolor: yellow
-    mutable: true
-    filter: true
-    autojoin: true
-    default: false
-    distance: 230
-    cooldown: 0
-    bungeecord: false
-    alias: l
-    permissions: None
-    speak_permissions: None
->>>>>>> master:src/config.yml
     format: '&f[&eLocal&f] {vault_prefix} {player_displayname}&e:'
\ No newline at end of file
diff --git a/src/main/resources/example_config_always_up_to_date!.yml b/src/main/resources/example_config_always_up_to_date!.yml
index 1c840ba..025ba92 100644
--- a/src/main/resources/example_config_always_up_to_date!.yml
+++ b/src/main/resources/example_config_always_up_to_date!.yml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD:src/main/resources/example_config_always_up_to_date!.yml
 #===============================================================
 #                     VentureChat Config                       =
 #                      Author: Aust1n46                        =                  
@@ -421,429 +420,4 @@ channels:
     alias: l
     permissions: None
     speak_permissions: None
-=======
-#===============================================================
-#                     VentureChat Config                       =
-#                      Author: Aust1n46                        =                  
-#===============================================================
-
-# - regex1,regex2
-# Simple regex tips: Use \b to "cut" a section of the word or phrase.  Example: \bass,donuts
-# Example filtered sentence: You are an ass.  Will become: You are an donuts.  
-# Example filtered sentence: You caught a bass.  Will stay: You caught a bass.  
-# Example filtered sentence: You are an asshole.  Will become: You are an donutshole.
-# Default filters by Jabelpeeps
-filters:
-- (\b.?anus),donuts
-- (\ba+r*(se+|ss+(?!(ass|um|oc|ign|ist)).*?|s*e*h+[o0]*[l1]+e*[sz]*)\b),donuts
-- (b[i1]a?tch(es)?),puppy
-- Carpet Muncher,cookie monster
-- (\bc((?!ook\b)[o0]+c*|aw)k\W?(sucker|s*|he[ea]*d)\b),rooster
-- (\b[ck]r+a+p+(er|s|z)?\b),poopoo
-- (\bcu+m+\b),go
-- (\b.?[ck](u*n+|[l1]+[i1]+)t+[sz]*\b),peach
-- (\b.?d[1i](c?k(head)?|[l1]+d[o0])e?[sz]?\b),rooster
-- f u c k( e r)?,nono
-- (\b.?fai*g+[oei1]*t*[sz]*\b),cigar
-- Fudge Packer,fine person
-- (\b(m[uo]+th[ae]r?)?(f|ph)uc*k*(e[rn]|ah*|ing?|)[sz]?\b),oh dear
-- (\b(j(ac|er|ur)k\W?(of+))|(ji[sz]+i*m*)\b),bake brownies
-- (\b(ma+s+te?rbai?te?[rs]?|wank(er)?[sz]?)\b),bake brownies
-- orafi(s|ce),rooster
-- (\bp+[e3]+[ai]*n+[i1!ua]+s+),rooster
-- (\bp[i1]s+(?!(ton))(flap|face|drop)?),peepee
-- (\b.?sh[i1!y]t+(er?|y|head)?[sz]*),poopoo
-- (\bva[1i]?[gj]+[i1]+na+\b),peach
-- vu[1l]+va,peach
-- planet.?minecraft,another dimension
-- pmc,another dimension
-- ((\d+\.){3}\d+),another dimension
-
-# command without the /
-blockablecommands:
-- vote
-- me
-
-# blacklisted nicknames 
-nicknames:
-- Notch
-
-nickname-in-tablist: true
-
-# {player} : player sending command
-# {command} : command typed
-commandspy:
-  format: '&6{player}: {command}'
-  worldeditcommands: true
-  
-antispam:
-  enabled: true
-  
-  # Number of messages to be spam
-  spamnumber: 5
-  
-  # Amount of time in seconds for it to be spam
-  spamtime: 10
-  
-  # Amount of time for the mute to last
-  # Acceptable units are: d,h,m,s
-  # Units can be combined, for example: 1d8h30m15s
-  # Use 0 for untimed mute
-  mutetime: 10m
- 
-# Logging chat and commands to a mysql database 
-mysql:
-  enabled: false
-  user: User
-  port: 3306
-  password: Password
-  host: localhost
-  database: Database
-
-# Loglevel feature is still in the works for adding of debug messages
-# Valid loglevels:
-# Info: Regular logging
-# Debug: Show extra messages and caught errors for debugging
-# Severe: Only show severe messages
-loglevel: info
-
-# saveinterval is in minutes
-saveinterval: 30
-
-# If you're running a "cracked" server, player data might not be stored properly, and thus, you are on your own.
-# If you run your server in offline mode, you might have to reset your player data when switching to online mode!
-# If you see this warning by accident and you are using BungeeCord, make sure you have properly setup IP Forwarding.
-# https://www.spigotmc.org/wiki/bungeecord-ip-forwarding/
-# No player data will be saved in offline mode unless you set this acknowledgement to 'true'
-offline_server_acknowledgement: false
-
-# The time in seconds between each check to remove timed mutes
-unmuteinterval: 60
-
-# Enables or disabled BungeeCord messaging
-bungeecordmessaging: false
-
-# Sound for message notification
-# Enter 'None' to disable the sound
-message_sound: ENTITY_PLAYER_LEVELUP
-
-# This will allow vanished players to be exempt from being sent private messages, and will act as if they aren't online
-vanishsupport: true
-
-# Use PlaceholderAPI placeholders
-# Start the placeholder with 'sender_' for the sending players placeholder
-# Start the placeholder with 'receiver_' for the receiving players placeholder
-# The defaults shown below provide an example of each
-tellformatto: '&7You message {receiver_vault_prefix}{receiver_player_displayname}&7:'
-tellformatfrom: '{sender_vault_prefix}{sender_player_displayname} &7messages you:'
-tellformatspy: '{sender_player_name} messages {receiver_player_name}:&7'
-replyformatto: '&7You reply to {receiver_vault_prefix}{receiver_player_displayname}&7:'
-replyformatfrom: '{sender_vault_prefix}{sender_player_displayname} &7replies to you:'
-replyformatspy: '{sender_player_name} replies to {receiver_player_name}:&7'
-
-# {host} : party hosts name
-# {player} : player name
-# use Default for the basic formatting
-partyformat: Default
-
-formatcleaner: true
-
-# If true, /ignore will block chat from the ignored player as well as PM's
-ignorechat: false
-
-# The message shown to players alerting them no one is in the channel to hear them
-emptychannelalert: "&6No one is listening to you."
-
-messageremoverpermissions: '&cYou need additional permissions to view this message!'
-messageremovertext: '&c&o<message removed>'
-
-# The name of the group is the permissions node for the format
-# Example: venturechat.json.Owner is the node for the group Owner
-# A lower priority overrides a higher priority if a player has more than 1 group
-# Possible options for click_name and click_prefix are suggest_command, run_command, and open_url
-jsonformatting:
-  Default: # This default format is required!  Do not delete or rename it!
-    priority: 2147483647 # Integer.MAX_VALUE
-    hover_name:
-    - '&6I have no rank!'
-    click_name: 'suggest_command'
-    click_name_text: '/msg {player_name}'
-    hover_prefix:
-    - '&dI am default!'
-    click_prefix: 'run_command'
-    click_prefix_text: '/help'
-    hover_suffix:
-    - '&dI am default suffix!'
-    click_suffix: 'suggest_command'
-    click_suffix_text: '/msg {player_name}'
-  Owner:
-    priority: 1 # Lowest Priority
-    hover_name:
-    - '&cOwner of the server!'
-    - '&bMessage me for help!'
-    click_name: 'suggest_command'
-    click_name_text: '/msg {player_name}'
-    hover_prefix:
-    - '&dServer Owner'
-    click_prefix: 'run_command'
-    click_prefix_text: '/help'
-    hover_suffix:
-    - '&dI am Owner suffix!'
-    click_suffix: 'suggest_command'
-    click_suffix_text: '/msg {player_name}'
-    
-# The icon is the block shown in the GUI
-# The text is the display name of the block icon
-# Include a slash (/) before the command   
-# Permissions are the name of the button and automatically include "venturechat." 
-# Example: mute equals venturechat.mute
-venturegui:
-  mute:
-    icon: 'REDSTONE_BLOCK'
-    durability: 0
-    text: '&cMute {player_name} &410m'
-    permission: 'mute'
-    command: '/mute {channel} {player_name} 10m'
-    slot: 1
-  unmute:
-    icon: 'DIAMOND_BLOCK'
-    durability: 0
-    text: '&bUnmute {player_name}'
-    permission: 'mute'
-    command: '/unmute {channel} {player_name} '
-    slot: 2
-  removemessage:
-    icon: 'DIAMOND_AXE'
-    durability: 0
-    text: '&cRemove Message'
-    permission: 'removemessage'
-    command: '/removemessage {hash} {channel}'
-    slot: 7
-
-guiicon: '&c [✓]'
-guitext: '&cOpen Moderation GUI'
-guirows: 1
-
-# All clickable URL's will be underlined if set to true
-underlineurls: true
-
-# broadcast information
-broadcast:
-  color: red
-  permissions: venturechat.adminchannel
-  displaytag: '[Broadcast]'
-  
-# Use $ to include arguments into the message  
-# Valid component types are:
-# Command: Sends a message or command in chat
-# Message: Sends a message to the player
-# Broadcast: Sends a broadcast to all players on the server
-# Permissions automatically include "venturechat." 
-# Example: permissions: alert equals venturechat.alert
-# Use None for no permissions
-# The number of arguments is the minimum number of required arguments, use 0 for no required arguments
-alias:  
-  vote:
-    arguments: 0
-    permissions: None
-    components:
-    - 'Message: &6Vote here: www.votelinkhere.com'
-  bane:
-    arguments: 2
-    permissions: bane
-    components:
-    - 'Command: /ban $ appeal at www.site.com'
-    - 'Command: /st banned $'
-  alert:
-    arguments: 1
-    permissions: alert
-    components:
-    - 'Broadcast: &c<Alert> $'
-  donate:
-    arguments: 0
-    permissions: None
-    components:
-    - 'Message: &bDonate here: www.mywebsite.com'
-  website:
-    arguments: 0
-    permissions: None
-    components:
-    - 'Message: &aThis is our website: www.site.net'
-  
-# Enables the creation of special Towny channels: Town and Nation
-# To create these channels, simply name two channels below "Town" and "Nation"
-# Bungeecord must be set to false for these channels! 
-enable_towny_channel: false
-
-# Enables the creation of a special faction only channel using the Factions plugin
-# To create this channel, simply name a channel below "Faction"
-# Bungeecord must be set to false for this channel!
-# WARNING: May not work for all versions of Factions!
-enable_factions_channel: false
-
-# color = [channel] color
-# chatcolor = text color
-# cooldown is in seconds
-# bungeecord overrides distance
-# channel permissions are configurable
-# channels can be changed, and new channels can be created
-# Permissions automatically include "venturechat." 
-# Example: permissions: staff equals venturechat.staff
-# Use None for no permissions
-
-# Use PlaceholderAPI placeholders are required!!!
-# Use PlaceholderAPI placeholders are required!!!
-# Use PlaceholderAPI placeholders are required!!!
-# /papi ecloud download [plugin]
-# /papi reload
-# Use '' or "" around format, example: '[&2global&f] {vault_prefix} {player_displayname}&2:'
-# You must have prefixes and suffixes set in a Vault compatible permissions plugin to avoid errors
-# Use "" as the prefix or suffix to have none
-
-# Set chatcolor to 'None' to have a group based chat color! Don't forget to put a suffix or other placeholder at the end of the format!
-
-# Important!!!
-# Important!!!
-# If you delete a channel, restart the server! Do not use /chatreload!!!
-channels:
-  GroupChatColorExample:
-    color: '#706C1E'
-    chatcolor: 'None'
-    mutable: true
-    filter: true
-    autojoin: true
-    default: false
-    distance: 0
-    cooldown: 0
-    bungeecord: false
-    alias: ge
-    permissions: None
-    speak_permissions: None
-    format: '&f[#706C1EGroupColorChat&f] {vault_prefix} {player_displayname}#706C1E:{vault_suffix}'
-  HexExample:
-    color: '#ff0000'
-    chatcolor: '#ff0000'
-    mutable: true
-    filter: true
-    autojoin: true
-    default: false
-    distance: 0
-    cooldown: 0
-    bungeecord: false
-    alias: he
-    permissions: None
-    speak_permissions: None
-    format: '&f[#ff0000Hex&f] {vault_prefix} {player_displayname}#ff0000:'
-  BungeeExample:
-    color: gold
-    chatcolor: gold
-    mutable: true
-    filter: true
-    autojoin: true
-    default: false
-    distance: 0
-    cooldown: 3
-    bungeecord: true
-    alias: be
-    permissions: None
-    speak_permissions: None
-    format: '&f[&6Network&f] {vault_prefix} {player_displayname}&6:'
-  AnnouncementExample:
-    color: red
-    chatcolor: red
-    mutable: false
-    filter: false
-    autojoin: true
-    default: false
-    distance: 0
-    cooldown: 0
-    bungeecord: true
-    alias: announce
-    permissions: None
-    speak_permissions: announcement
-    format: '&f[&aServer Announcement&f] {vault_prefix} {player_displayname}&c:'
-  Global:
-    color: dark_green
-    chatcolor: dark_green
-    mutable: true
-    filter: true
-    autojoin: true
-    default: true
-    distance: 0
-    cooldown: 0
-    bungeecord: false
-    alias: g
-    permissions: None
-    speak_permissions: None
-    format: '&f[&2Global&f] {vault_prefix} {player_displayname}&2:'
-  Staff:
-    color: green
-    chatcolor: green
-    mutable: false
-    filter: false
-    autojoin: true
-    default: false
-    distance: 0
-    cooldown: 0
-    bungeecord: false
-    alias: st
-    permissions: staffchannel
-    speak_permissions: None
-    format: '&f[&aStaff&f] {vault_prefix} {player_displayname}&a:'
-  Donator:
-    color: light_purple
-    chatcolor: light_purple
-    mutable: true
-    filter: true
-    autojoin: true
-    default: false
-    distance: 0
-    cooldown: 0
-    bungeecord: false
-    alias: d
-    permissions: donatorchannel
-    speak_permissions: None
-    format: '&f[&dDonator&f] {vault_prefix} {player_displayname}&d:'
-  Help:
-    color: aqua
-    chatcolor: aqua
-    mutable: true
-    filter: true
-    autojoin: true
-    default: false
-    distance: 0
-    cooldown: 0
-    bungeecord: false
-    alias: h
-    permissions: None
-    speak_permissions: None
-    format: '&f[&bHelp&f] {vault_prefix} {player_displayname}&b:'
-  Trade:
-    color: dark_aqua
-    chatcolor: dark_aqua
-    mutable: true
-    filter: true
-    autojoin: true
-    default: false
-    distance: 0
-    cooldown: 0
-    bungeecord: false
-    alias: t
-    permissions: None
-    speak_permissions: None
-    format: '&f[&3Trade&f] {vault_prefix} {player_displayname}&3:'
-  Local:
-    color: yellow
-    chatcolor: yellow
-    mutable: true
-    filter: true
-    autojoin: true
-    default: false
-    distance: 230
-    cooldown: 0
-    bungeecord: false
-    alias: l
-    permissions: None
-    speak_permissions: None
->>>>>>> master:src/example_config_always_up_to_date!.yml
     format: '&f[&eLocal&f] {vault_prefix} {player_displayname}&e:'
\ No newline at end of file
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index a002f44..c65d6cf 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,4 @@
 name: VentureChat
-<<<<<<< HEAD:src/main/resources/plugin.yml
 version: ${project.version}
 api-version: 1.13
 main: mineverse.Aust1n46.chat.MineverseChat
@@ -7,27 +6,7 @@ depend: [Vault, ProtocolLib, PlaceholderAPI]
 softdepend: [Towny, Factions, Heroes]
 author: Aust1n46
 website: https://bitbucket.org/Aust1n46/venturechat/
-description: #1 Channels Chat plugin! Spigot + Bungee. Supports PlaceholderAPI + JSON formatting. Moderation GUI!
-commands:
-    mute:
-        usage: /mute [playername] [channel]
-        aliases: [mp,vmute]
-        description: Mutes player in a channel so they cannot talk.
-        permission-message: You don't have <permission>
-    unmute:
-        usage: /unmute [playername] [channel]
-        aliases: [ump,vunmute]
-        description: Unmutes player in a channel so they can talk again.
-=======
-version: 2.23.3
-api-version: 1.13
-main: mineverse.Aust1n46.chat.MineverseChat
-depend: [Vault, ProtocolLib, PlaceholderAPI]
-softdepend: [Towny, Factions, Heroes]
-author: Aust1n46
-website: https://bitbucket.org/Aust1n46/venturechat/
 description: #1 Channels Chat plugin! Spigot + Bungee. Supports PlaceholderAPI + JSON formatting. Moderation GUI!
-commands:
     mute:
         usage: /mute [playername] [channel]
         aliases: [mp,vmute]
@@ -36,8 +15,7 @@ commands:
     unmute:
         usage: /unmute [playername] [channel]
         aliases: [ump,vunmute]
-        description: Unmutes player in a channel so they can talk again.
->>>>>>> master:src/plugin.yml
+        description: Unmutes player in a channel so they can talk again.
         permission-message: You don't have <permission>
     msg:
         usage: /msg [playername] [msg]