hook_schema changes
Fix conflict