adding HAL links and testing anchors
fix conflicts