add more in local dev
solve conflict in pull remote dev into local master