resolving conflict Minecraft Servers

resolving conflict