resolve conflict form merge branch 'master' of origin