fixed issue with branching
Completed init branches
Merge branch 'test'