re-merge source with license header info