what changes did i make?
fixed merge conflicts