Add js files
merge diffs