added images for the tileset
fixed conflicts