the add comments work
stupid mistake
ok fixed the merge problems