[misc]
* conflict has been fixed already
* add reference