edit messages.properties
 fix conflict messages.properties