check  merge_method option. add debug message
Merge branch 'master' into vcs