Index: /applications/editors/josm/plugins/alignways/build.xml
===================================================================
--- /applications/editors/josm/plugins/alignways/build.xml	(revision 24814)
+++ /applications/editors/josm/plugins/alignways/build.xml	(revision 24815)
@@ -31,5 +31,5 @@
 
 	<!-- enter the SVN commit message -->
-	<property name="commit.message" value="Update to josm latest" />
+	<property name="commit.message" value="fix shortcut conflict" />
 	<!--
 		enter the *lowest* JOSM version this plugin is currently compatible
Index: /applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java
===================================================================
--- /applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java	(revision 24814)
+++ /applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java	(revision 24815)
@@ -34,6 +34,5 @@
                 "around a chosen pivot."),
                 Shortcut.registerShortcut("tools:alignways", tr("Tool: {0}",
-                        tr("Align Ways")), KeyEvent.VK_A, Shortcut.GROUP_EDIT,
-                        Shortcut.SHIFT_DEFAULT), true);
+                        tr("Align Ways")), KeyEvent.VK_I, Shortcut.GROUP_EDIT), true);
         setEnabled(false);
     }