resolved merge issues...?
deleting extraneous image files