-Resolved conflict in MonopolyDeal.csproj file.