Added message form
corrected conflict