Arbitrary width registers
Resolve merge conflicts