Resolved merge conflict in EdtiCommandTest.java