Path to img folder changed
Merge conflict resolved