Bugfix
resolve merge conflict
completed coding