minor update to GitMergeContents
Merge branch 'development'