user story image
fixing merge