resolve merge conflict
update sound threshold, display current volume in gui