changed readme
resolve merge