fix merge problem with read me