Remove conflict from read me.