pull site
fix conflicts
header search + categories menu