bug fixed for production
resolve merge conflicted
added notes