resolved all merge conflicts and resolved buggy csproj