unresolved conflicts Minecraft Servers

unresolved conflicts