changed store BG to OS green
fixed conflicts