Fuckin white background
Resolved conflict