Attempt to resolve conflict in front end branch
Attempt to resolve conflict in front end branch

LandRegistry-Attic/concept-frontend,LandRegistry-Attic/concept-frontend,LandRegistry-Attic/concept-frontend,LandRegistry-Attic/concept-frontend