switching branches
bugs
merge conflicts