Fix conflicts hunks