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