Git Merge Aftermath

When people randomly think they doing the world a favour by doing a huge merge… and then conflicts!