Fix copytrim conflict