resolved all refdes conflicts