fixed hound and merge conflicts
fixed hound and merge conflicts