removed merge conflict code
removed merge conflict code

sap123/Images_Insta_Flickr,sap123/Images_Insta_Flickr,sap123/Images_Insta_Flickr,sap123/Images_Insta_Flickr,sap123/FreeWee-Wesbite,sap123/FreeWee-Wesbite,sap123/FreeWee-Wesbite,sap123/FreeWee-Wesbite