resolving forks