get rid of unneeded merges file
update readme
update readme