diff --git a/homework/github_week3/fibonacci.py b/homework/github_week3/fibonacci.py
index bf3a00f..a9a379c 100644
--- a/homework/github_week3/fibonacci.py
+++ b/homework/github_week3/fibonacci.py
@@ -5,16 +5,28 @@
 and functionally decomposes the calculations.
 Fill in all the missing code in the functions and in main
 """
+import math
 import typing
+import math
 
+
+<<<<<<< HEAD
 def get_input() -> int:
     """Gets input from the user and returns it as an integer"""
-    pass
+=======
+def get_input(inputed) -> int:
+>>>>>>> a3b976e3f0d4f1c701bb1e9334ad344c0d871413
+    return int(input())
 
 
 def fibonacci_list(n: int) -> typing.List[int]:
     """Returns a list of the first n Fibonacci numbers"""
-    pass
+    if isinstance(n, int):
+        fib_sequence = [1, 2]
+        for i in range(n-2):
+            add = fib_sequence[i] + fib_sequence[i + 1]
+            fib_sequence.append(add)
+        return fib_sequence
 
 
 def fibonacci_single(n: int) -> int:
@@ -23,23 +35,30 @@ def fibonacci_single(n: int) -> int:
 
 
 def golden_section_num() -> float:
-    """Returns the golden section number (capital Phi)"""
-    pass
+    """
+    Returns the golden section number (capital Phi)
+    """
+
+    return (1 + math.sqrt(5)) / 2
 
 
 def golden_section_reciprocal() -> float:
-    """Returns the reciprocal of the golden section number (lowercase phi)"""
-    pass
+    """
+    Returns the reciprocal of the golden section number (lowercase phi)
+    """
+    return (1 - math.sqrt(5)) / 2
 
 
 def power(num: int, n: int) -> int:
     """Raises num to the nth power"""
-    pass
+    result = math.pow(num, n)
+    return result
 
 
 def sqrt(num: int) -> float:
     """Returns the square root of num"""
-    pass
+    result = math.sqrt(num)
+    return result
 
 
 def main():