Made chanegs to resolve merge conflicts.