unresolved conflict Minecraft Servers

unresolved conflict