Removes merge conflict on BeATS_test.java