Resolve forgotten conflict