fixing merge
fixing background path