save registration to branch
add registration
resolving conflict
fix redirect to registration page