image in email working
merge onflict resolved