direct dev commit for conflict dev5