text
text
text
text
Resolve all the conflicts
Resolve all the conflicts x2
text