Fixing merge, added comments for Character manifest.