The only way to resolve this is to have centralized servers which are trusted to cooperate and organize around a single chain.