Edit examples v0.50.0

Tidying up #186 to remove merge commits and conflict markers.