img directory
fixed merge conflict