Re GIT-1 Using a branch
GIT-1 #resolve Merging things into master