Iceland supermarket drops decade-long trademark dispute with Iceland and offers “rapprochement discount”