Re-add required pysam package.
Fix merge conflict.