added karma
merge conflict