Fix merge conflicts.#43

LucasEhinger wants to merge 2 commits into

JeffersonLab:mainJeffersonLab/LADlib:mainfrom

LucasEhinger:mainLucasEhinger/LADlib:mainCopy head branch name to clipboard