Changes to the reception
Resolved Conflicts