fixed conflict in Content service for CS Fixes