lastest changes : image path
test fix conflicts