Resolve merge conflicts by only taking one side of each conflicted section

Changes for 0.8 - 2023-09-30

• Updating for release of version 0.8 Updating travis (Ivan Wills) Updated (Ivan Wills) Fixing conflict resolution when "both added" (Ivan Wills)