fix collapsed email form
fix conflict