-update conf bc of new branch
dumb edits to conf