Conflict Resolution

Fixed, hopefully