diff --git a/server.js b/server.js
index b0ebac5..5b1bb11 100644
--- a/server.js
+++ b/server.js
@@ -110,17 +110,37 @@ io.on('connection', function(socket){
                 fileSystem.writeFile(notePath, msg, 'utf-8', function(err) {
                     if (err) { winston.error(err); }
                     var exec = require('child_process').exec;
-                    var cmd = 'cd note-data && git commit -am "Notes modified via websocket, ' + now + '"';
+                    var cmd = `
+                        cd note-data && \
+                        git checkout -b ${now} && \
+                        git commit -am "Notes modified via websocket, ${now}" && \
+                        git checkout master && \
+                        git merge ${now}
+                    `;
                     winston.info(cmd);
                     exec(cmd, function(error, stdout, stderr) {
                         if (error) { winston.error(error); }
+                        if (!stdout.includes('CONFLICT')) {   // Case-sensitivity seems brittle here. Better to check return code rather than stdout? Can child_process be called w/signature to include return code?
+                            var cmd2 = `cd note-data && git branch -d ${now}`
+                            exec(cmd2, function(error, stdout, stderr) {
+                                if (error) { winston.error(error); }
+                                winston.info('temp branch deleted sucessfully');
+                                winston.info('new contents from client written to allNotes.txt');
+                                // Send new content to all other clients EXCEPT the orig sender.
+                                socket.broadcast.emit('download allNotes',msg);
+                                winston.info('sent content update to other clients');
+                            });
+                        } else {
+                            // Auto-merge failed, keep the new branch.
+                            // Send a conflict warning message to socket.io clients (prompt for IAP ;-).
+                            socket.emit('conflict', `Auto-merge failed, manually merge ${now} branch to rescue recent edit.`);
+                            socket.emit('download allNotes',data);  // Send pre-conflict content back down to client.
+                            winston.info(`Auto-merge failed, manually merge ${now} branch to rescue recent edit.`);
+                            // MVP for now, can deal w/merge conflicts with git on the server if the cotent needs to be saved.
+                        }
                         winston.info(stdout);
-                        winston.info('new contents from client written to allNotes.txt');
                     });
                 });
-                // Send new content to all other clients EXCEPT the orig sender.
-                socket.broadcast.emit('download allNotes',msg);
-                winston.info('sent content update to other clients');
             }
         });
     });
diff --git a/views/index.html b/views/index.html
index 315616b..e68d649 100644
--- a/views/index.html
+++ b/views/index.html
@@ -65,7 +65,7 @@
     CodeMirror.Vim.map('jj', '<Esc>', 'insert')
     // Hacked semi-colon/colon swap remap into /assets/keymap/vim.js...a heavy-handed fix.
     // Note, ~/notes.kaplon.us/CodeMirror is symlinked it into /assets!
-    // This no worky, there's no concept of <leader> in CodeMirror, but i was hoping this would work-around it.
+    // These 2 mappings don't work, there's no concept of <leader> in CodeMirror, but i was hoping this would work-around it.
     //CodeMirror.Vim.map(' c', '<Esc>o- [ ] ', 'normal')
     //CodeMirror.Vim.map(' x', '<ESC>;s/\[\s\]/[x]/g<CR>;noh<CR>', 'normal')
     CodeMirror.commands.save = function(){
@@ -96,6 +96,8 @@
         2000
       );
     });
+
+    socket.on('conflict', alert(msg));
 </script>
 </body>
 </html>