diff --git a/src/main/org/apache/tools/ant/taskdefs/defaults.properties b/src/main/org/apache/tools/ant/taskdefs/defaults.properties
index ebd7502fe..5cd1e8d0c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/defaults.properties
+++ b/src/main/org/apache/tools/ant/taskdefs/defaults.properties
@@ -58,12 +58,9 @@ bunzip2=org.apache.tools.ant.taskdefs.BUnzip2
 checksum=org.apache.tools.ant.taskdefs.Checksum
 waitfor=org.apache.tools.ant.taskdefs.WaitFor
 input=org.apache.tools.ant.taskdefs.Input
-<<<<<<< defaults.properties
 loadfile=org.apache.tools.ant.taskdefs.LoadFile
-=======
 manifest=org.apache.tools.ant.taskdefs.Manifest
 
->>>>>>> 1.100
 # optional tasks
 script=org.apache.tools.ant.taskdefs.optional.Script
 netrexxc=org.apache.tools.ant.taskdefs.optional.NetRexxC