Fixing paths, fixing div by zero with no images
Fixing Merge Conflict