changed opacity back to .5 and fixed conflicts