We do not currently know of any antonyms for got into conflict.
For similar words to got into conflict, try: