Work is set to resume on the regeneration of a Dublin estate after a dispute between the construction company Bam Building and Dublin City Council was resolved.