Updated the content type of features
Fixed conflict.