working on laptop
conflicts for laptop resolved