added images to fixtures
fixed merge conflicts