Fix conflicts typo