another weird commit.
merged stash conflict with kdfiff.