diff --git a/DESCRIPTION b/DESCRIPTION
index 52654fbf..c412649c 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -53,6 +53,7 @@ Collate:
     'Capr.R'
     'conceptSet.R'
     'attributes-concept.R'
+    'attributes-dateAdjustment.R'
     'attributes-logic.R'
     'query.R'
     'window.R'
diff --git a/R/window.R b/R/window.R
index 223cc6c8..11702a1c 100644
--- a/R/window.R
+++ b/R/window.R
@@ -92,7 +92,6 @@ continuousObservation <- function(priorDays = 0L, postDays = 0L) {
 
 }
 
-<<<<<<< HEAD
 #Depreciated Endpoint functions
 # #' A function to offset the number of days relative to index
 # #' @param days a number specifying the number of days to offset from index where
@@ -122,8 +121,6 @@ continuousObservation <- function(priorDays = 0L, postDays = 0L) {
 #       coeff = "after")
 # }
 
-=======
->>>>>>> 31a4286d79c78e2385a137ff974113247f06b699
 
 ## EventWindow ---------------------
 
diff --git a/man/EventAperture-class.Rd b/man/EventAperture-class.Rd
index cbb519ef..dd23b827 100644
--- a/man/EventAperture-class.Rd
+++ b/man/EventAperture-class.Rd
@@ -5,7 +5,8 @@
 \alias{EventAperture-class}
 \title{An S4 class for Aperture}
 \description{
-The aperture class provides context to when the criteria must be observed in a person timeline to pretain to the expression
+The aperture class provides context to when the criteria must be
+observed in a person timeline to pretain to the expression
 }
 \section{Slots}{