Fixing conflicts and updating routes