process images added
conflicts resolved on idea folder
conflicts resolved on idea folder