Added test for new branch and checking out a branch
Added merge test
added first part of merge test