Test conflict on GitHub