Fixed Conflicts when merging ConnectMaps

src/main/java/seng202/group9/Core/Airport.java

@@ -366,7 +366,6 @@ public class Airport {
 	}
 	public void hasDuplicate(Airport airport) throws DataException{
 		if (airport.getName().equals("") || airport.getName().equals(this.name)){
-			//System.out.println(airport.getName() + " "+ this.name);
 			throw new DataException("Airport Name already Exists, Please Choose Another.");
 		}
 		if (!airport.getIATA_FFA().equals("") && airport.getIATA_FFA().equals(this.name)){

src/main/java/seng202/group9/Core/Country.java

@@ -6,6 +6,7 @@ public class Country {
 	private String DST, name;
 	private ArrayList<City> cities = new ArrayList<City>();
 	private ArrayList<Airline> airlines = new ArrayList<Airline>();
+	private Position position;
 	
 	public Country(String DST, String name){
 		this.DST = DST;
@@ -81,4 +82,16 @@ public class Country {
 	public void delCities(int index){
 		this.cities.remove(index);
 	}
+
+	public ArrayList<City> getCities() {
+		return cities;
+	}
+
+	public Position getPosition() {
+		return position;
+	}
+
+	public void setPosition(Position position) {
+		this.position = position;
+	}
 }