diff --git a/client/modules/User/components/GithubButton.jsx b/client/modules/User/components/GithubButton.jsx
index 5bb2e283..cf80c3af 100644
--- a/client/modules/User/components/GithubButton.jsx
+++ b/client/modules/User/components/GithubButton.jsx
@@ -1,7 +1,8 @@
 import InlineSVG from 'react-inlinesvg';
-const githubUrl = require('../../../images/github.svg');
 import React, { PropTypes } from 'react';
 
+const githubUrl = require('../../../images/github.svg');
+
 function GithubButton(props) {
   return (
     <a
diff --git a/package.json b/package.json
index 1c6a952d..399774cc 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
   "scripts": {
     "start": "BABEL_DISABLE_CACHE=1 NODE_ENV=development nodemon index.js",
     "start:prod": "NODE_ENV=production node index.js",
-    "lint": "eslint client server",
-    "lint-fix": "eslint client server --fix",
+    "lint": "eslint client server --ext .jsx --ext .js",
+    "lint-fix": "eslint client server --ext .jsx --ext .js --fix",
     "build": "NODE_ENV=production webpack --config webpack.config.prod.js --progress",
     "test": "echo \"Error: no test specified\" && exit 1",
     "fetch-examples": "node fetch-examples.js",
diff --git a/server/controllers/project.controller.js b/server/controllers/project.controller.js
index 0ff5ebc8..28232f1c 100644
--- a/server/controllers/project.controller.js
+++ b/server/controllers/project.controller.js
@@ -41,7 +41,8 @@ export function updateProject(req, res) {
       return;
     }
     if (req.body.updatedAt && moment(req.body.updatedAt) < moment(project.updatedAt)) {
-      return res.status(409).send({ success: false, message: 'Attempted to save stale version of project.' });
+      res.status(409).send({ success: false, message: 'Attempted to save stale version of project.' });
+      return;
     }
     Project.findByIdAndUpdate(req.params.project_id,
       {