Resolve merge conflict for SampleBuilderFactory.cpp.

Core/StandardSamples/LayerRoughnessBuilder.cpp

Core/StandardSamples/LayerRoughnessBuilder.h

Core/StandardSamples/SampleBuilderFactory.cpp

Core/StandardSamples/SimulationRegistry.cpp

Core/StandardSamples/StandardSimulations.cpp

Core/StandardSamples/StandardSimulations.h

Tests/FunctionalTests/TestCore/CMakeLists.txt

...ionalTests/TestCore/LayerRoughness/LayerWithRoughness.cpp

...ctionalTests/TestCore/LayerRoughness/LayerWithRoughness.h

Tests/FunctionalTests/TestPyCore/CMakeLists.txt

Tests/FunctionalTests/TestPyCore/layerwithroughness.py

Tests/ReferenceData/BornAgain/layer_with_roughness.ima.gz