Fixed beep
Fixed merge conflict