Resolving Merge Conflicts in Rails Encrypted Credentials | Dark Hacker News