fix restkit conflic