change bg color to orange
fixing conflict