fix.js hahahaha 6am
merge