Peter Griffin
Conflict modified and merged