Merge conflict - have p4merge text - where from here?

Development Asset Creation FX
, , ,
1

Hi all,

I have a particle system I want to merge following a pull, I can see the different lines in the text files that p4merge produces.

Can I modify one of the files and commit the merge as I normally would? (I am using git)