diff --git a/deployment/linux/create_bundle.py b/deployment/linux/create_bundle.py
index a186f1e257ff9c2541da4dfb0adcc3a465c19a12..5f074eba3409a73c1efa5c374a1088677a474986 100644
--- a/deployment/linux/create_bundle.py
+++ b/deployment/linux/create_bundle.py
@@ -12,7 +12,10 @@ if len(sys.argv) < 2:
   print 'usage: create_bundle.py  additional_label'
   sys.exit()
 
+<<<<<<< HEAD
 #boost_string='\".so.1.42.0\"'
+=======
+>>>>>>> Further updated to create_bundle.py
 system_python_version='python2.6'
 system_python_bin='/usr/bin/'+system_python_version
 system_python_libs='/usr/lib/'+system_python_version
@@ -21,7 +24,7 @@ second_system_python_libs='/usr/lib/pymodules/'+system_python_version
 python_bin_in_bundle='python'
 qt4_plugins='/usr/lib/qt4/plugins'
 additional_label=sys.argv[1]
-list_of_excluded_libraries=['ld-linux','libexpat','libgcc_s','libglib','cmov','libice','libSM','libX','libg','libGL.so','libfontconfig','libfreetype','libdrm','libxcb','libICE']
+list_of_excluded_libraries=['ld-linux','libexpat','libgcc_s','libglib','cmov','libice','libSM','libX','libg','libGL.so','libfontconfig','libfreetype','libdrm','libxcb','libICE','libnvidia','libc']
 currdir=os.getcwd()
 if currdir.find('deployment')==-1 or currdir.find('linux')==-1:
   print '\n'