Resolving Merge Conflicts in Rails Encrypted Credentials(aaron-gray.com)

https://www.aaron-gray.com/resolving-merge-conflicts-in-rails-encrypted-credentials/