Resolve conflict on Cats.sln