added bg
fixing conflicts