added missing migration for messages
fixed merge conflict