Conditional stimulus choices affect fear learning: Comparing fear conditioning with neutral faces and shapes or angry faces