Conflict resolution work

I honestly don't know what all was changed