karma config
bla
changes
resolving conflict