mergin initial commits from 2 forks