Fix unresolved conflict in karma.conf.js

Signed-off-by: Alex Coles <alex@alexbcoles.com>