working on readme.
fix conflicts.