fixing the div
ugh MERGING