bugs and breadcrumbs
conflict fix