merge branch and push local changes