diff --git a/Logic Programming Mission.pdf b/project-1/Logic Programming Mission.pdf
similarity index 100%
rename from Logic Programming Mission.pdf
rename to project-1/Logic Programming Mission.pdf
diff --git a/input.pl b/project-1/input.pl
similarity index 100%
rename from input.pl
rename to project-1/input.pl
diff --git a/solution.pl b/project-1/solution.pl
similarity index 98%
rename from solution.pl
rename to project-1/solution.pl
index 9fe7ce2..d0fedf3 100644
--- a/solution.pl
+++ b/project-1/solution.pl
@@ -352,6 +352,7 @@ selec/4 predicate.
 For “INSERT”, nothing needs to be printed by query/1 or in case of
 success, and if query/2 is used the Result parameter can be ignored.
 */
+<<<<<<< HEAD:solution.pl
 query(Query, Result):-
 	parse_query(Query, Fun, Args),
 	apply(Fun, Args),
@@ -482,6 +483,10 @@ parse_cond( +AtomLeft=AtomRight, Cond):-
 is_number(R, N):-
 	atom_number(N, R); R = N.
 
+=======
+query(Query, Result, Rest) :-
+	prolog_term(Result, [';']). 
+>>>>>>> d17a9b1 (Move project-1):project-1/solution.pl
 
 :- dynamic query/1.
 /*
diff --git a/tests.pl b/project-1/tests.pl
similarity index 100%
rename from tests.pl
rename to project-1/tests.pl
diff --git a/tests_dcg.pl b/project-1/tests_dcg.pl
similarity index 100%
rename from tests_dcg.pl
rename to project-1/tests_dcg.pl