test how to branch and merge