which branch to merger