Merge changes from other copies of LSC