Kylie Minogue and Kylie Jenner trademark battle resolved