Conflicts

Replaces the main file in the game to resolve the conflicts.