Release v1.6.0

What's Changed

• Release Candidate v1.5.0-rc.1 to main by @jekingry in #61
• Release Candidate v1.5.0-rc.2 to main by @jekingry in #63
• Release Candidate v1.5.0-rc.3 to main by @jekingry in #65
• cleanup by @jekingry in #69
• create conflict by @jekingry in #72
• conflict merge should fail by @jekingry in #73
• abort merge by @jekingry in #74

Full Changelog: v1.5.2...v1.6.0