add maps js file
reconciled conflicts