merged the fork