merge jscratch files
lin is now lin-env