more read me updates
fix conflict