Fix unresolved merge conflicts
Fix unresolved merge conflicts

TelerikAcademy-Cloning/CSharp-Part-1,spior/CSharp-Part-1,TelerikAcademy-Cloning/CSharp-Part-1,spior/CSharp-Part-1,TelerikAcademy-Cloning/CSharp-Part-1,spior/CSharp-Part-1