Form functionality and mobile polish
Resolving conflicts