updated new dev section
fix trivial merge conflict