fix bug in commit id: c3fdf3 merge branch

New: see Diff.