advancing into search. merge styling.
merged conflicts