again on hf
resolveing conflict