File :-(, x, )
Anonymous
Now this is how to resolve conflicts
>> Anonymous
     File :-(, x)
Now this is how to resolve conflicts