[misc] Fix conflict