base in 6.8 and head branch should be version 3.0