Hello ,
For conflict type , you have a maintain an action . So in order to resolve the conflict , you have to take that action /solution .
Kindly take the action for the conflict and adjust the conflict .
Let me know if you still does not works for you .
Thanks ,
Abhishek Gupta.