[misc] Fixed merge conflicts