[misc] conflict has been fixed already