terminal
resolve The diff