Resolve merge conflicts for upstream merge

import.php

@@ -12,7 +12,6 @@
  */
 require_once './libraries/common.inc.php';
 //require_once './libraries/display_import_functions.lib.php';
-$GLOBALS['js_include'][] = 'functions.js';
 
 // reset import messages for ajax request
 $_SESSION['Import_message']['message'] = null;