modified athlete form
resolved merge conflit