Add a brick and a nest
Resolve merge conflicts