Fix mis-staged commit hunk