closed the div and fixed conflict