tools version?
Merge remote-tracking branch 'origin/fix' into fix
committing flag changes
Merge remote-tracking branch 'origin/fix' into fix
fixed conflict