cleaning things up with the merge
setup