fixed read me conflict