fix conflicts in content type features