Civil service union settles on pay