updated karma
merge fix