jasper changes
merge conflict fixed