[misc] Ignore conflict