The highly contentious teacher merit pay proposal that was shot down by Gov. Charlie Crist last spring has re-emerged, but with some preliminary concessions to teachers and also perhaps to Gov.-elect Rick Scott, who as the father of a special education teacher voiced concerns about the proposal’s fairness to some educators.