Merge pull request #17 from ikwattro/cs

fixed conflict in Content service for CS Fixes
run cs fix with config