readme change
bug fix
resolve merge conflict
complete