diff --git a/src/js/app.js b/src/js/app.js
index 5b7f2f9..0f6bdea 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -362,11 +362,7 @@ function attemptCheckin(id, name, broadcast) {
 									if(currentConfig.timeline === 1) {
 										var pin = createPin(checkin.id,venue.name,venue.location.address);
 // 										console.log('Inserting pin now: ' + JSON.stringify(pin));
-<<<<<<< HEAD
 										timeline.insertUserPin(pin, function(responseText) {
-=======
-										timeline.insertUserPin(pin, function(responseText) {
->>>>>>> master
 // 											console.log('User Pin Result: ' + responseText);
 										});
 									}