Fork modification merge