[misc] Fixed the conflict at one of the source of the issue