add specs
fix merge