remove blockspec
fix merge