dev_raw midify
dev modify conflict fixed