fix when edit twice it will recommit the previous change.
change display format
Merge remote-tracking branch 'origin/dip' into dip