* link to server framework
* Resolve conflict