updated background margin
fixed conflict