fix bug for production
resolve merge conflict
added notes, completed coding