bug fix another version
resolve merge conflict
complete version