German interior minister says dispute with Merkel is history