feedback tps with finger points
fix merge conflicts