.csproje merged with Felipe changes