fix merge diffs after save
fix merge diffs after save

ghk/sideka-electron,wm-mrx/sideka-electron,ghk/sideka-electron,ghk/sideka-electron,wm-mrx/sideka-electron,wm-mrx/sideka-electron,ghk/sideka-electron,wm-mrx/sideka-electron