merge relevant branches all the way to the main repo