added registration for device form
Resolved conflicts