add dev
git conflict resolve from origin