Add athlete name to attempt.  Calculate total seconds from post fields.
resolve merge conflict
Use only Time/Distance from attempt as appropriate, get other value from challenge