Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).