image paths
merge conflicts