Fix surefire conflict