redoing the reply functionality by hand rather than continuing to fight the merge demons