Orders minor change
all files added
tried to resolve a merge conflict in the csproj file