After months of acrimony, Baghdad and Erbil are taking steps to sort out the oil-fueled dispute that threatened to tear Iraq to pieces.