* changed to posedge clk
fixed merge conflicts