trying to implement reply
solved merge conflicts