add new forms
fix conflicts