fixed merge conflicts, commented out poetry section loading