whoops, fixed divs
merge
fixed conflict