fixed residuals of previous merge
3 files changed