registration tweak
fixed merge conflict