diff --git a/unittest/unittest.depend b/unittest/unittest.depend
index ee14cde..29a2a4b 100644
--- a/unittest/unittest.depend
+++ b/unittest/unittest.depend
@@ -200,3 +200,70 @@
 	<string>
 	<math.h>
 
+1748439318 source:c:\users\home\desktop\Катюха\МЭИ\лааабы\lab34\laba01\histogram.cpp
+	"histogram.h"
+
+1748243654 c:\users\home\desktop\Катюха\МЭИ\лааабы\lab34\laba01\histogram.h
+	<vector>
+	<iostream>
+
+1748800793 source:c:\users\home\desktop\Катюха\МЭИ\лааабы\lab34\laba01\svg.cpp
+	"svg.h"
+
+1748436618 c:\users\home\desktop\Катюха\МЭИ\лааабы\lab34\laba01\svg.h
+	<iostream>
+	<vector>
+	<string>
+	<math.h>
+
+1748439286 source:c:\users\home\desktop\Катюха\МЭИ\лааабы\lab34\laba01\unittest.cpp
+	"doctest.h"
+	"histogram_internal.h"
+
+1748430260 c:\users\home\desktop\Катюха\МЭИ\лааабы\lab34\laba01\doctest.h
+	<signal.h>
+	<ciso646>
+	<cstddef>
+	<ostream>
+	<istream>
+	<type_traits>
+	"doctest_fwd.h"
+	<ctime>
+	<cmath>
+	<climits>
+	<math.h>
+	<new>
+	<cstdio>
+	<cstdlib>
+	<cstring>
+	<limits>
+	<utility>
+	<fstream>
+	<sstream>
+	<iostream>
+	<algorithm>
+	<iomanip>
+	<vector>
+	<atomic>
+	<mutex>
+	<set>
+	<map>
+	<unordered_set>
+	<exception>
+	<stdexcept>
+	<csignal>
+	<cfloat>
+	<cctype>
+	<cstdint>
+	<string>
+	<sys/types.h>
+	<unistd.h>
+	<sys/sysctl.h>
+	<AfxWin.h>
+	<windows.h>
+	<io.h>
+	<sys/time.h>
+	<unistd.h>
+
+1748439318 c:\users\home\desktop\Катюха\МЭИ\лааабы\lab34\laba01\histogram_internal.h
+
diff --git a/unittest/unittest.layout b/unittest/unittest.layout
index 037030b..c1cae47 100644
--- a/unittest/unittest.layout
+++ b/unittest/unittest.layout
@@ -2,9 +2,15 @@
 <CodeBlocks_layout_file>
 	<FileVersion major="1" minor="0" />
 	<ActiveTarget name="Debug" />
+<<<<<<< HEAD
 	<File name="..\histogram_internal.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="208" topLine="0" />
+=======
+	<File name="..\svg.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="721" topLine="18" />
+>>>>>>> 7d31711f139c94dfcdd92d28b83842336d4ed5c1
 		</Cursor>
 	</File>
 	<File name="..\histogram.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -12,9 +18,20 @@
 			<Cursor1 position="216" topLine="0" />
 		</Cursor>
 	</File>
+<<<<<<< HEAD
 	<File name="..\svg.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="721" topLine="18" />
+=======
+	<File name="..\unittest.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="858" topLine="4" />
+		</Cursor>
+	</File>
+	<File name="..\histogram_internal.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="208" topLine="0" />
+>>>>>>> 7d31711f139c94dfcdd92d28b83842336d4ed5c1
 		</Cursor>
 	</File>
 	<File name="..\doctest.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">