updating deadci with latest for linux
updating deadci with latest for mac
merging with concflicst