Fix merge conflict
Fix merge conflict

baegjins/Waves,fians/Waves,b-cuts/Waves,mcanthony/Waves-Effect,Papapashu/Waves,luffy94608/Waves,dangcheng/Waves,aceforce/Waves,jsermeno/Waves,wiringtheworld/Waves,rockmandew/Waves