updated code
updated issues
updated mergeissues