[misc] Fixed bad merge