Testing fix for branching

Testing to see that the fix worked.
test merge

testing merge funtionality