diff --git a/lib/Sync.js b/lib/Sync.js
index 1e193493..941ac37a 100644
--- a/lib/Sync.js
+++ b/lib/Sync.js
@@ -8,13 +8,7 @@ function spec() {
   var config          = require('../config/config');
   var Block           = require('../app/models/Block');
   var Transaction     = require('../app/models/Transaction');
-<<<<<<< Updated upstream
-  var TransactionItem = require('../app/models/TransactionItem');
   var sockets         = require('../app/controllers/socket.js');
-  var CONCURRENCY     = 5;
-=======
-  var sockets         = require('../app/views/sockets/main.js');
->>>>>>> Stashed changes
 
 
   function Sync() {
diff --git a/server.js b/server.js
index b69b910d..1d61a87a 100644
--- a/server.js
+++ b/server.js
@@ -72,10 +72,8 @@ if (!config.disableP2pSync) {
 }
 
 // express app
-
-/*jshint validthis:true */
-var app = express(); 
-
+/*global app: true*/
+var app = express();
 
 //express settings
 require('./config/express')(app, db);
@@ -86,7 +84,7 @@ require('./config/routes')(app);
 // socket.io
 var server = require('http').createServer(app);
 var ios = require('socket.io').listen(server);
-require('./app/controllers/socket.js').init(app,io);
+require('./app/controllers/socket.js').init(app,ios);
 
 //Start the app by listening on <port>
 var port = process.env.PORT || config.port;