templated results complete!
fixed merge errors