remove SGP warning
merge