Map.cs conflict resolved