device icon download
merge conflict