Manual merge Branch edit - fixes #1

Mergin a branch edit