Conflict Resolution

I will be back online soon