merge from citybeat