Fixed density crap
Fixed merge conflicts.