never resolved conflict Minecraft Servers

never resolved conflict