RegBasedFifo Unit and TB changed
conflicts solved