merge zach and isaac
fixed merge conflict