LOCAL merge-and-conflicts-training Training to merge and solve conflicts Hello World Just saying hello