Resolving Merge Conflicts in Rails Encrypted Credentials | Hacker News Reader