my attempt at a merge conflict
fixed merge conflicts