fixed features conflicts