Resolved merge conflict with intial voice recognition code.