merge the newest js/css