Japan proposes ending whaling ban