merge appropriate thinkcity changes