Has anyone tracked down the problem with conflict resolution not working?