add background
fix conflict