bg opacity and black changes
fix conflicts