Update Program.cs in local master, simulating edit conflict
Update Program.cs, merged local and remote changes