Dispute over ‘Farishtey’ scheme ends, Supreme Court asks Delhi govt., L-G to make peace