fixed merge after merge with the merge branch and origin/merge branch