changed Register
fixed merge