Fixing conflict

configure.ac

src/Decomposition/Distribution/Distribution_unit_tests.hpp

...tion/test_data/0_vtk_parmetis_distribution_0_osx_test.vtk

...on/test_data/0_vtk_parmetis_distribution_100_osx_test.vtk

...ion/test_data/0_vtk_parmetis_distribution_10_osx_test.vtk

...ion/test_data/0_vtk_parmetis_distribution_20_osx_test.vtk

...ion/test_data/0_vtk_parmetis_distribution_30_osx_test.vtk

...ion/test_data/0_vtk_parmetis_distribution_40_osx_test.vtk

...ion/test_data/0_vtk_parmetis_distribution_50_osx_test.vtk

...ion/test_data/0_vtk_parmetis_distribution_60_osx_test.vtk

...ion/test_data/0_vtk_parmetis_distribution_70_osx_test.vtk

...ion/test_data/0_vtk_parmetis_distribution_80_osx_test.vtk

...ion/test_data/0_vtk_parmetis_distribution_90_osx_test.vtk

...n/test_data/vtk_dist_parmetis_distribution_0_osx_test.vtk

...test_data/vtk_dist_parmetis_distribution_100_osx_test.vtk

.../test_data/vtk_dist_parmetis_distribution_10_osx_test.vtk

.../test_data/vtk_dist_parmetis_distribution_20_osx_test.vtk

.../test_data/vtk_dist_parmetis_distribution_30_osx_test.vtk

.../test_data/vtk_dist_parmetis_distribution_40_osx_test.vtk

.../test_data/vtk_dist_parmetis_distribution_50_osx_test.vtk