merge
merge
merge
added city in time fragment