The past tense of come into conflict is came into conflict.
The third-person singular simple present indicative form of come into conflict is comes into conflict.
The present participle of come into conflict is coming into conflict.
The past participle of come into conflict is come into conflict.