updated register
fixed conflicts