edited the program.cs conflicting
commited after merging