update
merge laptop with github