merging private and public forks