Corrections to resolve merge conflicts