trying to resolve merge conflicts
corrected 3 resolved conflicts