adf
conflict resolved