changes in Form1
Conflicts fixed