Revert commit bb6ec943bf8292a55a12f3156e0aa5d49ca254f4 but just rename to "flag_atlas_CONFLICT" to avoid conflicts.
Revert commit bb6ec943bf8292a55a12f3156e0aa5d49ca254f4 but just rename to "flag_atlas_CONFLICT" to avoid conflicts.

hookbot/multi-player,hookbot/multi-player