Created Message Form
Resolved Conflicts