image added in marker
conflicts
issues solved