Merge back from webjars