bug fix v1.1 for production
resolve merge conflict
completed code edit note