merge fix de basketball.java