update readme too
Fix conflict