something got screwy when merging, fixing master branch