add line dev5, dev6
merge dev to master use no-ff