resolve merge conflict and keep admin no-overwrite for autofill in event form
resolve merge conflict and keep admin no-overwrite for autofill in event form

rubymonsters/diversity_ticketing,rubymonsters/diversity_ticketing,rubymonsters/diversity_ticketing