fix README and meta
Fix conflict