git merge messed up some files; no real edits here