For the complete documentation index, see llms.txt. This page is also available as Markdown.

⚡ Quick Start

1. Open the panel

Run:

/conflicttool

Then start a Scan.

Large servers with hundreds of resources can take longer to scan. The progress overlay shows the current phase while the scan is running.

The scan is processed in slices, so players can remain connected and the server should continue ticking normally. If other players are online when the tool is opened, Conflict Tool shows a confirmation step before scanning.

2. Review the conflict list

Detected conflicts appear in the left panel and are grouped by type:

  • All

  • Collision

  • Occl

  • Prop

  • Asset

Conflicts are also geographically clustered.

After a scan, a focus filter lets you choose which resources you currently care about. Other resources can be hidden from the list and shown again later.

3. Inspect a conflict

Select a conflict to see:

  • what the conflict is,

  • which resource changed what,

  • the suggested resolution,

  • the confidence level.

Depending on the conflict type, you can also inspect it in the world using tools such as:

  • free cam,

  • in-world markers,

  • collision overlay for .ybn conflicts,

  • prop movement gizmo,

  • occluder position adjustments.

4. Choose a resolution

Depending on the conflict, available decisions can include:

  • Keep

  • Remove

  • Move

  • Pick a winner

  • Merge

  • Ignore

You can also use Auto-resolve.

Auto-resolve applies all suggestions the scanner marked as safe and skips conflicts marked needs review by default. You can explicitly include review items if you want them included.

Nothing is written to disk yet. Decisions remain pending until you apply them.

You can undo a decision or reset an individual conflict before applying.

5. Apply the changes

When you are satisfied with the pending decisions, click Apply.

Before changing any file, Conflict Tool automatically creates a backup of every file it is about to touch.

The confirmation dialog also lets you enter a title and note. These are saved with the backup so you can identify it later.

6. Restart FXServer

A restart is required after applying changes.

The rewritten resource files are only streamed to players after FXServer restarts. Once files have been applied or restored, the current session is locked to a restart screen so nobody continues editing a world that no longer matches the files on disk.

Last updated