Old userstories merged