change log
change log done
resolving conflicts on issue-139