added messages files
fixed merge conflict
added message files