altered Candidate pilot view
fix merge conflict
fix merge conflict