add registration forms
fix merge conflicts