added phone and email form vailidation
fix conflicts