fixed conflicts, improved form

no need to review.