fixed merge conflict
fixed merge conflict

MgenGlder/ArtisticaGallery-Website-Draft,MgenGlder/ArtisticaGallery-Website-Draft,MgenGlder/ArtisticaGallery-Website-Draft,MgenGlder/ArtisticaGallery-Website-Draft