resolving diffs between webmedsvr master and alveo branches