search compltd
conflicts
small changes