diff --git a/src/layers/conv.jl b/src/layers/conv.jl
index 467c1e95..1ce69c1c 100644
--- a/src/layers/conv.jl
+++ b/src/layers/conv.jl
@@ -51,7 +51,6 @@ function Base.show(io::IO, l::Conv)
   print(io, ")")
 end
 
-<<<<<<< HEAD
 (a::Conv{<:Any,<:Any,W})(x::AbstractArray{T}) where {T <: Union{Float32,Float64}, W <: AbstractArray{T}} =
   invoke(a, Tuple{AbstractArray}, x)