Try to determine the root cause of the conflict and remedy if possible without being confrontational. If that is not successful then try to limit interaction. Finally, if the situation inhibits your job performance seek assistance following the proper chain of command.