Register now or log in to join your professional community.
Resolving the conflict & also Maintain Decorum....
Take them out for lunch more frequently and allow the conflicting subordinates more time together.
Some joint assignments may also work.