fix conflict and leftover code from testy page