The resolution also called for an end to the 21-month-old conflict between the government and a separate rebel group in Darfur , which has left more than a million people displaced .