laptop oassis
fixed merge conflcit