California Officer Killed Armed Man during Dispute