fixed a mistake in the merge. Now it should compile
fixed a mistake in the merge. Now it should compile

karmaresearch/kognac,jrbn/kognac,jrbn/kognac,jrbn/kognac,karmaresearch/kognac,karmaresearch/kognac,karmaresearch/kognac