no more test - make make now merges properly
updated todo