backgrounds
fixed merged conflicts