Removed csproj file from repo -a
Removed classdiagram form
Fixed merge conflict in main.cs