Fix issue in server edit config due to merge of branches.