merge dev and download