diff --git a/Hackerrank/Write a Function.py b/Hackerrank/Write a Function.py
index 40e93b2..8d7c2e5 100644
--- a/Hackerrank/Write a Function.py	
+++ b/Hackerrank/Write a Function.py	
@@ -1,45 +1,3 @@
-<<<<<<< HEAD
-# We add a Leap Day on February 29, almost every four years. The leap day is an extra, or intercalary day and we add it to the shortest month of the year, February.
-# In the Gregorian calendar three criteria must be taken into account to identify leap years:
-#
-# The year can be evenly divided by 4, is a leap year, unless:
-# The year can be evenly divided by 100, it is NOT a leap year, unless:
-# The year is also evenly divisible by 400. Then it is a leap year.
-# This means that in the Gregorian calendar, the years 2000 and 2400 are leap years, while 1800, 1900, 2100, 2200, 2300 and 2500 are NOT leap years.Source
-#
-# Task 
-# You are given the year, and you have to write a function to check if the year is leap or not.
-#
-# Note that you have to complete the function and remaining code is given as template.
-#
-# Input Format
-#
-# Read y, the year that needs to be checked.
-#
-# Constraints
-#
-#
-# Output Format
-#
-# Output is taken care of by the template. Your function must return a boolean value (True/False)
-#
-# Sample Input 0
-#
-# 1990
-# Sample Output 0
-#
-# False
-# Explanation 0
-#
-# 1990 is not a multiple of 4 hence it's not a leap year.
-def is_leap(year):
-    leap = False
-    if(year%4==0 and not (year%100==0) or year%400==0):
-        leap = True
-    return leap
-
-year = int(input())
-=======
 # We add a Leap Day on February 29, almost every four years. The leap day is an extra, or intercalary day and we add it to the shortest month of the year, February.
 # In the Gregorian calendar three criteria must be taken into account to identify leap years:
 #
@@ -80,5 +38,4 @@ def is_leap(year):
     return leap
 
 year = int(input())
->>>>>>> 97a7e02 (update)
 print(is_leap(year))
\ No newline at end of file