Resolved merge conflict in EdtiCommandTest.java

diff --cc test/jalview/commands/EditCommandTest.java
index 375ae55,ee2a581..6fa7c22
--- 1/test/jalview/commands/EditCommandTest.java
--- 2/test/jalview/commands/EditCommandTest.java
+++ b/test/jalview/commands/EditCommandTest.java
@@@ -30,8 -30,9 +30,8 @@@ public class EditCommandTes
  
    private Alignment al;
  
 -  @BeforeMethod(groups =
 -  { "Functional" })
 -  public void setUp()
 + @BeforeMethod(alwaysRun = true)
-   public void setUp()
++   public void setUp()
    {
      testee = new EditCommand();
      seqs = new SequenceI[4];