move code into the appropriate branch