attemped to merge rest server