We have some extra files here which should be removed.

PackageManagementSolution.cs.BASE.cs
PackageManagementSolution.cs.Local.cs
PackageManagementSolution.cs.REMOTE.cs