adding laptop
merge fix