-n 
added dist
-n 
fixed image file path
-n 
fixed merge conflict