Merge thinkcity work