Changed READ.me
Confilct resoved