merge practiceadded a city
added both conflicts