diff --git a/setup.sh b/setup.sh
index b6ecefa47..736b31093 100755
--- a/setup.sh
+++ b/setup.sh
@@ -10,11 +10,11 @@ function warn() {
 # Import all project repositories
 if [[ $DISABLE_VCS != "true" ]]; then
     echo "Importing project repositories..."
-    vcs import < src/new_project.repos src
+    vcs import < src/new_project.repos src --skip-existing
 else
     warn "VCS disabled. Skipping project repository imports..."
 fi
 
 sudo apt-get update
-rosdep update --rosdistro $ROS_DISTRO 
-rosdep install --from-paths src --ignore-src -y --rosdistro $ROS_DISTRO 
+rosdep update --rosdistro $ROS_DISTRO
+rosdep install --from-paths src --ignore-src -y --rosdistro $ROS_DISTRO