merge: etc: update remaining files