Index: trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 16652)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 16657)
@@ -74,5 +74,5 @@
 
     /**
-     * two identical nodes, even in id and version. No confict expected.
+     * two identical nodes, even in id and version. No conflict expected.
      *
      * Can happen if data is loaded in two layers and then merged from one layer
Index: trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 16652)
+++ trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 16657)
@@ -490,5 +490,5 @@
         TimeZone.setDefault(DateUtils.UTC);
 
-        // Force log handers to reacquire reference to (junit's fake) stdout/stderr
+        // Force log handlers to reacquire reference to (junit's fake) stdout/stderr
         for (Handler handler : Logging.getLogger().getHandlers()) {
             if (handler instanceof Logging.ReacquiringConsoleHandler) {
@@ -700,5 +700,5 @@
 
     /**
-     * The junit timeout statement has problems when switchting timezones. This one does not.
+     * The junit timeout statement has problems when switching timezones. This one does not.
      * @author Michael Zangl
      */