more annoying updating between branches