--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/generics/InheritanceConflict.java	Tue Sep 12 19:03:39 2017 +0200
@@ -0,0 +1,21 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 4984158
+ * @summary two inherited methods with same signature
+ * @author gafter, Maurizio Cimadamore
+ *
+ * @compile/fail/ref=InheritanceConflict.out -XDrawDiagnostics   InheritanceConflict.java
+ */
+
+package inheritance.conflict;
+
+class A<T> {
+    void f(String s) {}
+}
+
+class B<T> extends A<T> {
+    void f(T t) {}
+}
+
+class C extends B<String> {
+}