Relative image path
Fixed merge conflicts