voice_trigger
resolving conflicts