Fix repeat of special keys after merge