[Zoheiry][Finished registers integrated with wires]
fixing conflicts
fixing conflicts