No, for our program, we have to resolve all the conflicts, then we can merge
What we did for our project was we added all the conflicts into a list. And removed all of them.
