Integration of server
resolution conflits

Signed-off-by: stefens <stephen.schmidt.pro@gmail.com>