image paths
merge conflict