Officials ok proposed resolution of Blackrock dispute