debugged js error - css was interfering
merge conflicts