My mistake, I mis-read the git merge tool in wrong order...