ticket summary first cut
minor changes
resolved conflicts
removing workspace