modify dev local 1st
merge with dev