updated readme
temporary changelog
resolved conflict README