diff --git a/msm.conf b/msm.conf
index 14ec667..e208892 100644
--- a/msm.conf
+++ b/msm.conf
@@ -162,3 +162,4 @@ DEFAULT_MESSAGE_COMPLETE_BACKUP_STARTED="Backing up entire server."
 # The default message to send to players when a serer finishes backing up the
 # entire server directory:
 DEFAULT_MESSAGE_COMPLETE_BACKUP_FINISHED="Backup complete."
+>>>>>>> Updated msm.conf for Minecraft 1.3 messages.