There are research on the topic of how to deescalate conflict among groups, along lines of race, religion and nationality.

Minimize the displaying of symbols, especially those that symbolize difference in values.

Treat people equally. Same laws, same rules, same methods of handling people.

When there is an absolute need for borders, make the border distinct and obvious.

Symbolic actions of understanding can often be more important than practical actions.