local version
Adding special features
Merge branch 'local'

Why am I having to state why this is necessary!?
Merging with local branch to include cool new features