image paths
resolved merge conflict